acabat el nou motor d'animacions

Makefile

@@ -26,7 +26,7 @@ ifeq ($(OS),Windows_NT)
     FixPath = $(subst /,\,$1)
 	SOURCES := source/*.cpp source/common/*.cpp
 	CXXFLAGS:= -std=c++11 -Wall -Os -ffunction-sections -fdata-sections -Wl,--gc-sections -static-libstdc++ -Wl,-subsystem,windows
-	CXXFLAGS2:= -std=c++11 -Wall -Os -ffunction-sections -fdata-sections -Wl,--gc-sections -static-libstdc++
+	CXXFLAGS2:= -std=c++11 -Wall -static-libstdc++
 	LDFLAGS := -lmingw32 -lws2_32 -lSDL2main -lSDL2 -lopengl32
 	RM = del /Q
 	MKD:= mkdir

data/gfx/player.ani

@@ -45,7 +45,7 @@ frames=20,21,22,23
 
 [animation]
 name=death
-speed=5
+speed=15
 loop=0
 frames=24,25,26,27
 [/animation]

source/game.cpp

@@ -28,6 +28,15 @@ Game::Game(int playerID, int currentStage, SDL_Renderer *renderer, Screen *scree
 	scoreboard = new Scoreboard(renderer, screen, asset, lang, options);
 	background = new Background(renderer, screen, asset, param);
 
+	// Inicializa vectores
+	playerAnimations.clear();
+	balloonAnimations.clear();
+	itemAnimations.clear();
+	player1Textures.clear();
+	player2Textures.clear();
+	itemTextures.clear();
+	balloonTextures.clear();
+
 	// Carga los recursos
 	loadMedia();
 
@@ -90,50 +99,71 @@ Game::~Game()
 
 	// Animaciones
 	for (auto animation : playerAnimations)
+	{
+		if (animation)
 		{
 			delete animation;
 		}
+	}
 	playerAnimations.clear();
 
 	for (auto animation : balloonAnimations)
+	{
+		if (animation)
 		{
 			delete animation;
 		}
+	}
 	balloonAnimations.clear();
 
 	for (auto animation : itemAnimations)
+	{
+		if (animation)
 		{
 			delete animation;
 		}
+	}
 	itemAnimations.clear();
 
 	// Texturas
 	for (auto texture : player1Textures)
+	{
+		if (texture)
 		{
 			texture->unload();
 			delete texture;
 		}
+	}
 	player1Textures.clear();
 
 	for (auto texture : player2Textures)
+	{
+		if (texture)
 		{
 			texture->unload();
 			delete texture;
 		}
+	}
 	player2Textures.clear();
 
 	for (auto texture : itemTextures)
+	{
+		if (texture)
 		{
 			texture->unload();
 			delete texture;
 		}
+	}
 	itemTextures.clear();
 
 	for (auto texture : balloonTextures)
+	{
+		if (texture)
 		{
 			texture->unload();
 			delete texture;
 		}
+	}
 	balloonTextures.clear();
 
 	delete scoreboard;
@@ -423,61 +453,31 @@ void Game::loadMedia()
 	itemTextures.push_back(item6);
 
 	// Texturas - Player1
-	Texture *player1Head = new Texture(renderer, asset->get("player_bal1_head.png"));
+	Texture *player1 = new Texture(renderer, asset->get("player.png"));
-	player1Textures.push_back(player1Head);
+	player1Textures.push_back(player1);
 
-	Texture *player1Body = new Texture(renderer, asset->get("player_bal1_body.png"));
+	Texture *player1Power = new Texture(renderer, asset->get("player_power.png"));
-	player1Textures.push_back(player1Body);
+	player1Textures.push_back(player1Power);
-
-	Texture *player1Legs = new Texture(renderer, asset->get("player_bal1_legs.png"));
-	player1Textures.push_back(player1Legs);
-
-	Texture *player1Death = new Texture(renderer, asset->get("player_bal1_death.png"));
-	player1Textures.push_back(player1Death);
-
-	Texture *player1Fire = new Texture(renderer, asset->get("player_bal1_fire.png"));
-	player1Textures.push_back(player1Fire);
 
 	playerTextures.push_back(player1Textures);
 
 	// Texturas - Player2
-	Texture *player2Head = new Texture(renderer, asset->get("player_arounder_head.png"));
+	Texture *player2 = new Texture(renderer, asset->get("player.png"));
-	player2Textures.push_back(player2Head);
+	player2Textures.push_back(player2);
 
-	Texture *player2Body = new Texture(renderer, asset->get("player_arounder_body.png"));
+	Texture *player2Power = new Texture(renderer, asset->get("player_power.png"));
-	player2Textures.push_back(player2Body);
+	player2Textures.push_back(player2Power);
-
-	Texture *player2Legs = new Texture(renderer, asset->get("player_arounder_legs.png"));
-	player2Textures.push_back(player2Legs);
-
-	Texture *player2Death = new Texture(renderer, asset->get("player_arounder_death.png"));
-	player2Textures.push_back(player2Death);
-
-	Texture *player2Fire = new Texture(renderer, asset->get("player_arounder_fire.png"));
-	player2Textures.push_back(player2Fire);
 
 	playerTextures.push_back(player2Textures);
 
 	// Animaciones -- Jugador
-	std::vector<std::string> *playerHeadAnimation = new std::vector<std::string>;
+	std::vector<std::string> *playerAnimation = new std::vector<std::string>;
-	loadAnimations(asset->get("player_head.ani"), playerHeadAnimation);
+	loadAnimations(asset->get("player.ani"), playerAnimation);
-	playerAnimations.push_back(playerHeadAnimation);
+	playerAnimations.push_back(playerAnimation);
 
-	std::vector<std::string> *playerBodyAnimation = new std::vector<std::string>;
+	std::vector<std::string> *playerPowerAnimation = new std::vector<std::string>;
-	loadAnimations(asset->get("player_body.ani"), playerBodyAnimation);
+	loadAnimations(asset->get("player_power.ani"), playerPowerAnimation);
-	playerAnimations.push_back(playerBodyAnimation);
+	playerAnimations.push_back(playerPowerAnimation);
-
-	std::vector<std::string> *playerLegsAnimation = new std::vector<std::string>;
-	loadAnimations(asset->get("player_legs.ani"), playerLegsAnimation);
-	playerAnimations.push_back(playerLegsAnimation);
-
-	std::vector<std::string> *playerDeathAnimation = new std::vector<std::string>;
-	loadAnimations(asset->get("player_death.ani"), playerDeathAnimation);
-	playerAnimations.push_back(playerDeathAnimation);
-
-	std::vector<std::string> *playerFireAnimation = new std::vector<std::string>;
-	loadAnimations(asset->get("player_fire.ani"), playerFireAnimation);
-	playerAnimations.push_back(playerFireAnimation);
 
 	// Animaciones -- Globos
 	std::vector<std::string> *balloon1Animation = new std::vector<std::string>;
@@ -2441,37 +2441,28 @@ void Game::renderSmartSprites()
 // Acciones a realizar cuando el jugador muere
 void Game::killPlayer(Player *player)
 {
-	if (!player->isEnabled())
+	if (!player->isEnabled() && player->isInvulnerable())
-	{
+	{ // Si no está habilitado o tiene inmunidad, no hace nada
 		return;
 	}
 
-	if (!player->isInvulnerable())
+	// Si tiene cafes
-	{
 	if (player->hasExtraHit())
-		{
+	{ // Lo pierde
 		player->removeExtraHit();
 		throwCoffee(player->getPosX() + (player->getWidth() / 2), player->getPosY() + (player->getHeight() / 2));
 		JA_PlaySound(coffeeOutSound);
 		screen->shake();
 	}
 	else
-		{
+	{ // Si no tiene cafes, muere
 		JA_PauseMusic();
 		stopAllBalloons(10);
 		JA_PlaySound(playerCollisionSound);
 		screen->shake();
 		JA_PlaySound(coffeeOutSound);
 		player->setAlive(false);
-			if (allPlayersAreDead())
+		allPlayersAreDead() ? JA_StopMusic() : JA_ResumeMusic();
-			{
-				JA_StopMusic();
-			}
-			else
-			{
-				JA_ResumeMusic();
-			}
-		}
 	}
 }
 

source/player.cpp

@@ -8,12 +8,9 @@ Player::Player(float x, int y, SDL_Renderer *renderer, std::vector<Texture *> te
 	this->renderer = renderer;
 
 	// Reserva memoria para los objetos
-	headSprite = new AnimatedSprite(texture[0], renderer, "", animations[0]);
+	playerSprite = new AnimatedSprite(texture[0], renderer, "", animations[0]);
-	bodySprite = new AnimatedSprite(texture[1], renderer, "", animations[1]);
+	powerSprite = new AnimatedSprite(texture[1], renderer, "", animations[1]);
-	legsSprite = new AnimatedSprite(texture[2], renderer, "", animations[2]);
+	powerSprite->getTexture()->setAlpha(224);
-	deathSprite = new AnimatedSprite(texture[3], renderer, "", animations[3]);
-	fireSprite = new AnimatedSprite(texture[4], renderer, "", animations[4]);
-	fireSprite->getTexture()->setAlpha(224);
 
 	// Establece la posición inicial del jugador
 	defaultPosX = posX = x;
@@ -27,11 +24,8 @@ Player::Player(float x, int y, SDL_Renderer *renderer, std::vector<Texture *> te
 // Destructor
 Player::~Player()
 {
-	delete headSprite;
+	delete playerSprite;
-	delete bodySprite;
+	delete powerSprite;
-	delete legsSprite;
-	delete deathSprite;
-	delete fireSprite;
 }
 
 // Iniciador
@@ -78,19 +72,11 @@ void Player::init()
 	cooldown = 10;
 
 	// Establece la posición del sprite
-	legsSprite->setPosX(posX);
+	playerSprite->setPosX(posX);
-	legsSprite->setPosY(posY);
+	playerSprite->setPosY(posY);
-
-	bodySprite->setPosX(posX);
-	bodySprite->setPosY(posY);
-
-	headSprite->setPosX(posX);
-	headSprite->setPosY(posY);
 
 	// Selecciona un frame para pintar
-	legsSprite->setCurrentAnimation("stand");
+	playerSprite->setCurrentAnimation("stand");
-	bodySprite->setCurrentAnimation("stand");
-	headSprite->setCurrentAnimation("stand");
 }
 
 // Actua en consecuencia de la entrada recibida
@@ -143,31 +129,25 @@ void Player::move()
 		}
 
 		// Actualiza la posición del sprite
-		legsSprite->setPosX(getPosX());
+		playerSprite->setPosX(getPosX());
-		legsSprite->setPosY(posY);
+		playerSprite->setPosY(posY);
 
-		bodySprite->setPosX(getPosX());
+		powerSprite->setPosX(getPosX() - 2);
-		bodySprite->setPosY(posY);
+		powerSprite->setPosY(posY - 10);
-
-		headSprite->setPosX(getPosX());
-		headSprite->setPosY(posY);
-
-		fireSprite->setPosX(getPosX() - 2);
-		fireSprite->setPosY(posY - 10);
 	}
 	else
 	{
-		deathSprite->update();
+		playerSprite->update();
 
 		// Si el cadaver abandona el area de juego por los laterales
-		if ((deathSprite->getPosX() < PLAY_AREA_LEFT) || (deathSprite->getPosX() + width > PLAY_AREA_RIGHT))
+		if ((playerSprite->getPosX() < PLAY_AREA_LEFT) || (playerSprite->getPosX() + width > PLAY_AREA_RIGHT))
 		{
 			// Restaura su posición
-			const float vx = deathSprite->getVelX();
+			const float vx = playerSprite->getVelX();
-			deathSprite->setPosX(deathSprite->getPosX() - vx);
+			playerSprite->setPosX(playerSprite->getPosX() - vx);
 
 			// Rebota
-			deathSprite->setVelX(-vx);
+			playerSprite->setVelX(-vx);
 		}
 	}
 }
@@ -183,27 +163,23 @@ void Player::render()
 			{
 				if (powerUp)
 				{
-					fireSprite->render();
+					powerSprite->render();
 				}
-				legsSprite->render();
+				playerSprite->render();
-				bodySprite->render();
-				headSprite->render();
 			}
 		}
 		else
 		{
 			if (powerUp)
 			{
-				fireSprite->render();
+				powerSprite->render();
 			}
-			legsSprite->render();
+			playerSprite->render();
-			bodySprite->render();
-			headSprite->render();
 		}
 	}
 	else
 	{
-		deathSprite->render();
+		playerSprite->render();
 	}
 }
 
@@ -231,15 +207,6 @@ void Player::setFiringStatus(int status)
 void Player::setAnimation()
 {
 	// Crea cadenas de texto para componer el nombre de la animación
-	std::string aBodyCoffees = "";
-	std::string aHeadCoffees = "";
-	if (coffees > 0)
-	{
-		aBodyCoffees = coffees == 1 ? "_1C" : "_2C";
-		aHeadCoffees = "_1C";
-	}
-
-	const std::string aPowerUp = powerUp ? "_pwr" : "";
 	const std::string aWalking = statusWalking == PLAYER_STATUS_WALKING_STOP ? "stand" : "walk";
 	const std::string aFiring = statusFiring == PLAYER_STATUS_FIRING_UP ? "centershoot" : "sideshoot";
 
@@ -247,32 +214,29 @@ void Player::setAnimation()
 	const SDL_RendererFlip flipFire = statusFiring == PLAYER_STATUS_FIRING_RIGHT ? SDL_FLIP_HORIZONTAL : SDL_FLIP_NONE;
 
 	// Establece la animación a partir de las cadenas
-	legsSprite->setCurrentAnimation(aWalking);
+	if (alive)
-	legsSprite->setFlip(flipWalk);
-	if (statusFiring == PLAYER_STATUS_FIRING_NO)
 	{
-		// No esta disparando
+		if (statusFiring == PLAYER_STATUS_FIRING_NO)
-		bodySprite->setCurrentAnimation(aWalking + aBodyCoffees + aPowerUp);
+		{ // No esta disparando
-		bodySprite->setFlip(flipWalk);
+			playerSprite->setCurrentAnimation(aWalking);
-		headSprite->setCurrentAnimation(aWalking + aHeadCoffees + aPowerUp);
+			playerSprite->setFlip(flipWalk);
-		headSprite->setFlip(flipWalk);
+		}
+		else
+		{ // Está disparando
+			playerSprite->setCurrentAnimation(aWalking + "-" + aFiring);
+			playerSprite->setFlip(flipFire);
+		}
 	}
 	else
 	{
-		// Está disparando
+		playerSprite->setCurrentAnimation("death");
-		bodySprite->setCurrentAnimation(aFiring + aBodyCoffees + aPowerUp);
-		bodySprite->setFlip(flipFire);
-		headSprite->setCurrentAnimation(aFiring + aHeadCoffees + aPowerUp);
-		headSprite->setFlip(flipFire);
 	}
 
 	// Actualiza las animaciones de los sprites
-	legsSprite->animate();
+	playerSprite->animate();
-	bodySprite->animate();
-	headSprite->animate();
 
-	fireSprite->animate();
+	powerSprite->setFlip(flipWalk);
-	fireSprite->setFlip(flipWalk);
+	powerSprite->animate();
 }
 
 // Obtiene el valor de la variable
@@ -338,7 +302,6 @@ void Player::update()
 	updateCooldown();
 	updatePowerUpCounter();
 	updateInvulnerableCounter();
-	updatePowerUpHeadOffset();
 }
 
 // Obtiene la puntuación del jugador
@@ -375,15 +338,9 @@ void Player::setAlive(bool value)
 
 	if (!alive)
 	{
-		deathSprite->setPosX(headSprite->getRect().x);
+		playerSprite->setAccelY(0.2f);
-		deathSprite->setPosY(headSprite->getRect().y);
+		playerSprite->setVelY(-6.6f);
-		deathSprite->setAccelY(0.2f);
+		rand() % 2 == 0 ? playerSprite->setVelX(3.3f) : playerSprite->setVelX(-3.3f);
-		deathSprite->setVelY(-6.6f);
-		deathSprite->setVelX(3.3f);
-		if (rand() % 2 == 0)
-		{
-			deathSprite->setVelX(-3.3f);
-		}
 	}
 }
 
@@ -402,27 +359,15 @@ void Player::setScoreMultiplier(float value)
 // Aumenta el valor de la variable hasta un máximo
 void Player::incScoreMultiplier()
 {
-	if (scoreMultiplier < 5.0f)
-	{
 	scoreMultiplier += 0.1f;
-	}
+	scoreMultiplier = std::min(scoreMultiplier, 5.0f);
-	else
-	{
-		scoreMultiplier = 5.0f;
-	}
 }
 
 // Decrementa el valor de la variable hasta un mínimo
 void Player::decScoreMultiplier()
 {
-	if (scoreMultiplier > 1.0f)
-	{
 	scoreMultiplier -= 0.1f;
-	}
+	scoreMultiplier = std::max(scoreMultiplier, 1.0f);
-	else
-	{
-		scoreMultiplier = 1.0f;
-	}
 }
 
 // Obtiene el valor de la variable
@@ -572,34 +517,14 @@ void Player::shiftColliders()
 // Obtiene el puntero a la textura con los gráficos de la animación de morir
 Texture *Player::getDeadTexture()
 {
-	return deathSprite->getTexture();
+	return playerSprite->getTexture();
-}
-
-// Actualiza el valor de la variable
-void Player::updatePowerUpHeadOffset()
-{
-	if (powerUp)
-		if (powerUpCounter < 300)
-		{
-			if (powerUpCounter % 6 > 2)
-			{
-				fireSprite->setEnabled(false);
-			}
-			else
-			{
-				fireSprite->setEnabled(true);
-			}
-		}
 }
 
 // Pone las texturas del jugador
 void Player::setPlayerTextures(std::vector<Texture *> texture)
 {
-	headSprite->setTexture(texture[0]);
+	playerSprite->setTexture(texture[0]);
-	bodySprite->setTexture(texture[1]);
+	powerSprite->setTexture(texture[1]);
-	legsSprite->setTexture(texture[2]);
-	deathSprite->setTexture(texture[3]);
-	fireSprite->setTexture(texture[4]);
 }
 
 // Activa o descativa el jugador

source/player.h

@@ -30,11 +30,8 @@ class Player
 private:
 	// Objetos y punteros
 	SDL_Renderer *renderer;		  // El renderizador de la ventana
-	AnimatedSprite *headSprite;	 // Sprite para dibujar la cabeza
+	AnimatedSprite *playerSprite; // Sprite para dibujar el jugador
-	AnimatedSprite *bodySprite;	 // Sprite para dibujar el cuerpo
+	AnimatedSprite *powerSprite;  // Sprite para dibujar el aura del jugador con el poder a tope
-	AnimatedSprite *legsSprite;	 // Sprite para dibujar las piernas
-	AnimatedSprite *deathSprite; // Sprite para dibujar el jugador derrotado
-	AnimatedSprite *fireSprite;	 // Sprite para dibujar el aura del jugador con el poder a tope
 
 	// Variables
 	float posX; // Posicion en el eje X
@@ -75,8 +72,6 @@ private:
 	// Actualiza el valor de la variable
 	void updateInvulnerableCounter();
 
-	// Actualiza el valor de la variable
-	void updatePowerUpHeadOffset();
 
 public:
 	// Constructor