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

Trabajando en la reescritura del código

Browse Source
This commit is contained in:
Sergio
2022-09-26 14:06:44 +02:00
parent 837bcbd1da
commit b092d3f86a
10 changed files with 244 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
source/balloon.cpp
View File

@@ -55,13 +55,19 @@ void Balloon::init(float x, float y, Uint8 kind, float velx, float speed, Uint16
// Establece los frames de cada animación
for (int i = 0; i < NUM_FRAMES_BALLON; i++)
{
mSprite->setAnimationFrames(BALLOON_MOVING_ANIMATION, i, 50 + OFFSET_ORANGE_BALLOONS, 21 + (37 * i), getWidth(), getHeight());
}
for (int i = 0; i < NUM_FRAMES_BALLON_BORN; i++)
{
mSprite->setAnimationFrames(BALLOON_BORN_ANIMATION, i, 50 + OFFSET_BLUE_BALLOONS, 21 + (37 * i), getWidth(), getHeight());
}
for (int i = 0; i < NUM_FRAMES_BALLON_POP; i++)
{
mSprite->setAnimationFrames(BALLOON_POP_ANIMATION, i, 50 + OFFSET_EXPLOSIONS, 21 + (37 * i), getWidth(), getHeight());
}
break;
@@ -407,13 +413,13 @@ void Balloon::init(float x, float y, Uint8 kind, float velx, float speed, Uint16
mKind = kind;
// Inicializa las variables para la animación
mSprite->setCurrentFrame(0);
mSprite->setAnimationCounter(0);
// mSprite->setCurrentFrame(0);
// mSprite->setAnimationCounter(0);
// Establece el numero de frames de cada animacion
mSprite->setAnimationNumFrames(BALLOON_MOVING_ANIMATION, NUM_FRAMES_BALLON);
mSprite->setAnimationNumFrames(BALLOON_POP_ANIMATION, NUM_FRAMES_BALLON_POP);
mSprite->setAnimationNumFrames(BALLOON_BORN_ANIMATION, NUM_FRAMES_BALLON_BORN);
// mSprite->setAnimationNumFrames(BALLOON_MOVING_ANIMATION, NUM_FRAMES_BALLON);
// mSprite->setAnimationNumFrames(BALLOON_POP_ANIMATION, NUM_FRAMES_BALLON_POP);
// mSprite->setAnimationNumFrames(BALLOON_BORN_ANIMATION, NUM_FRAMES_BALLON_BORN);
// Establece la velocidad de cada animación
mSprite->setAnimationSpeed(BALLOON_MOVING_ANIMATION, 10);
@@ -631,9 +637,9 @@ void Balloon::updateState()
{
setInvulnerable(true);
setStop(true);
if (mSprite->isCompleted(BALLOON_POP_ANIMATION))
if (mSprite->animationIsCompleted())
{
mSprite->setCompleted(BALLOON_POP_ANIMATION, false);
mSprite->setAnimationCompleted(BALLOON_POP_ANIMATION, false);
mTimeToLive = 0;
disable();
}
@@ -699,11 +705,14 @@ void Balloon::updateState()
{
// Si está detenido, reduce el contador
if (mStoppedCounter > 0)
{
mStoppedCounter--;
}
// Si el contador ha llegado a cero, ya no está detenido
else if (!isPopping())
// Quitarles el estado "detenido" si no estan explosionando
{ // Quitarles el estado "detenido" si no estan explosionando
setStop(false);
}
}
}
@@ -712,11 +721,19 @@ void Balloon::updateAnimation()
{
// Establece el frame de animación
if (isPopping())
mSprite->animate(BALLOON_POP_ANIMATION);
{
mSprite->setCurrentAnimation(BALLOON_POP_ANIMATION);
}
else if (isBeingCreated())
mSprite->animate(BALLOON_BORN_ANIMATION);
{
mSprite->setCurrentAnimation(BALLOON_BORN_ANIMATION);
}
else
mSprite->animate(BALLOON_MOVING_ANIMATION);
{
mSprite->setCurrentAnimation(BALLOON_MOVING_ANIMATION);
}
mSprite->animate();
}
// Comprueba si el globo está habilitado