From 5fd1ffa865d3ed155af6776cbd4653744c6e9603 Mon Sep 17 00:00:00 2001 From: Sergio Valor Date: Tue, 4 Oct 2022 16:58:10 +0200 Subject: [PATCH] Retocado el borde de la powerball y quitados los efectos de rebote --- data/gfx/balloon4.ani | 2 +- data/gfx/balloon4.png | Bin 13436 -> 21034 bytes source/animatedsprite.cpp | 2 +- source/balloon.cpp | 57 +++++++++++++++++++++++++------------- source/game.cpp | 4 +-- source/movingsprite.cpp | 6 +++- 6 files changed, 47 insertions(+), 24 deletions(-) diff --git a/data/gfx/balloon4.ani b/data/gfx/balloon4.ani index 1db5a21..abd9c7a 100644 --- a/data/gfx/balloon4.ani +++ b/data/gfx/balloon4.ani @@ -31,7 +31,7 @@ frames=36,37,38,39,40,41,42,43,44,45 [animation] name=powerball -speed=20 +speed=10 loop=0 frames=48 [/animation] diff --git a/data/gfx/balloon4.png b/data/gfx/balloon4.png index f5f63da9a98ee484baffcc3bda07b95ac05c93fd..8608d571a44138bfedaf9b5491803d0cd0ced4ee 100644 GIT binary patch literal 21034 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 *source) // Recorre todo el vector int index = 0; - while (index < source->size()) + while (index < (int)source->size()) { // Lee desde el vector line = source->at(index); diff --git a/source/balloon.cpp b/source/balloon.cpp index 53e0949..6bdb26e 100644 --- a/source/balloon.cpp +++ b/source/balloon.cpp @@ -209,7 +209,7 @@ Balloon::Balloon(float x, float y, Uint8 kind, float velx, float speed, Uint16 c // Añade rotación al sprite mSprite->setRotate(false); - mSprite->setRotateSpeed(1); + mSprite->setRotateSpeed(0); mSprite->setRotateAmount(2.0); break; @@ -254,8 +254,8 @@ Balloon::Balloon(float x, float y, Uint8 kind, float velx, float speed, Uint16 c mVisible = true; mInvulnerable = true; mBeingCreated = true; - mCreationCounter = creationtimer; - mCreationCounterIni = creationtimer; + mCreationCounter = creationtimer; + mCreationCounterIni = creationtimer; mPopping = false; mCounter = 0; @@ -300,31 +300,41 @@ void Balloon::render() { if (mBouncing.enabled) { - // Aplica desplazamiento para el zoom - mSprite->setPosX(getPosX() + mBouncing.despX); - mSprite->setPosY(getPosY() + mBouncing.despY); - mSprite->render(); - mSprite->setPosX(getPosX() - mBouncing.despX); - mSprite->setPosY(getPosY() - mBouncing.despY); + if (mKind != POWER_BALL) + { + // Aplica desplazamiento para el zoom + mSprite->setPosX(getPosX() + mBouncing.despX); + mSprite->setPosY(getPosY() + mBouncing.despY); + mSprite->render(); + mSprite->setPosX(getPosX() - mBouncing.despX); + mSprite->setPosY(getPosY() - mBouncing.despY); + } } else if (isBeingCreated()) { // Aplica alpha blending mSprite->getTexture()->setAlpha(255 - (int)((float)mCreationCounter * (255.0f / (float)mCreationCounterIni))); 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; + } mSprite->getTexture()->setAlpha(255); } else { 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; + if (mKind == POWER_BALL) + { + Sprite *sp = new Sprite(mSprite->getRect(), mSprite->getTexture(), mSprite->getRenderer()); + sp->setSpriteClip(370, 148, 37, 37); + sp->render(); + delete sp; + } } } } @@ -351,7 +361,10 @@ void Balloon::move() mSprite->switchRotate(); // Activa el efecto de rebote - bounceStart(); + if (mKind != POWER_BALL) + { + bounceStart(); + } } // Mueve el globo hacia arriba o hacia abajo @@ -367,7 +380,10 @@ void Balloon::move() mVelY = -mVelY; // Activa el efecto de rebote - bounceStart(); + if (mKind != POWER_BALL) + { + bounceStart(); + } } // Si el globo se sale por la parte inferior @@ -380,7 +396,10 @@ void Balloon::move() mVelY = -mDefaultVelY; // Activa el efecto de rebote - bounceStart(); + if (mKind != POWER_BALL) + { + bounceStart(); + } } /* diff --git a/source/game.cpp b/source/game.cpp index 515d4ca..ffbbfe0 100644 --- a/source/game.cpp +++ b/source/game.cpp @@ -15,7 +15,7 @@ Game::Game(int numPlayers, int currentStage, SDL_Renderer *renderer, Screen *scr // Pasa variables mDemo.enabled = demo; mNumPlayers = numPlayers; - mCurrentStage = currentStage; + mCurrentStage = 4;//currentStage; mLastStageReached = currentStage; if (mNumPlayers == 1) { @@ -2695,7 +2695,7 @@ void Game::update() // Comprueba el nivel de amenaza para ver si se han de crear nuevos enemigos if (!mGameCompleted) { - updateMenace(); + //updateMenace(); } // Actualiza la velocidad de los enemigos diff --git a/source/movingsprite.cpp b/source/movingsprite.cpp index 291eca2..4588c40 100644 --- a/source/movingsprite.cpp +++ b/source/movingsprite.cpp @@ -251,7 +251,11 @@ void MovingSprite::rotate() if (enabled) if (rotateEnabled) { - if (counter % rotateSpeed == 0) + if (rotateSpeed == 0) + { + incAngle(rotateAmount); + } + else if (counter % rotateSpeed == 0) { incAngle(rotateAmount); }