tornem a deixar els fitxers balloon.png com estaven

This commit is contained in:
2024-07-30 12:02:15 +02:00
parent f4484b24f1
commit 884cacbc2e
33 changed files with 104 additions and 336 deletions

View File

@@ -331,48 +331,34 @@ void Game::loadMedia()
// Texturas
bulletTexture = new Texture(renderer, asset->get("bullet.png"));
gameTextTexture = new Texture(renderer, asset->get("game_text.png"));
gameOverTexture = new Texture(renderer, asset->get("menu_game_over.png"));
gameOverEndTexture = new Texture(renderer, asset->get("menu_game_over_end.png"));
// Texturas - Globos
Texture *balloon1Texture = new Texture(renderer, asset->get("balloon1.gif"));
balloon1Texture->addPalette(asset->get("balloon_blue_pal.gif"));
balloon1Texture->addPalette(asset->get("balloon_yellow_pal.gif"));
balloon1Texture->addPalette(asset->get("balloon_green_pal.gif"));
Texture *balloon1Texture = new Texture(renderer, asset->get("balloon1.png"));
balloonTextures.push_back(balloon1Texture);
Texture *balloon2Texture = new Texture(renderer, asset->get("balloon2.gif"));
balloon2Texture->addPalette(asset->get("balloon_blue_pal.gif"));
balloon2Texture->addPalette(asset->get("balloon_yellow_pal.gif"));
balloon2Texture->addPalette(asset->get("balloon_green_pal.gif"));
Texture *balloon2Texture = new Texture(renderer, asset->get("balloon2.png"));
balloonTextures.push_back(balloon2Texture);
Texture *balloon3Texture = new Texture(renderer, asset->get("balloon3.gif"));
balloon3Texture->addPalette(asset->get("balloon_blue_pal.gif"));
balloon3Texture->addPalette(asset->get("balloon_yellow_pal.gif"));
balloon3Texture->addPalette(asset->get("balloon_green_pal.gif"));
Texture *balloon3Texture = new Texture(renderer, asset->get("balloon3.png"));
balloonTextures.push_back(balloon3Texture);
Texture *balloon4Texture = new Texture(renderer, asset->get("balloon4.gif"));
balloon4Texture->addPalette(asset->get("balloon_blue_pal.gif"));
balloon4Texture->addPalette(asset->get("balloon_yellow_pal.gif"));
balloon4Texture->addPalette(asset->get("balloon_green_pal.gif"));
Texture *balloon4Texture = new Texture(renderer, asset->get("balloon4.png"));
balloonTextures.push_back(balloon4Texture);
Texture *balloon5Texture = new Texture(renderer, asset->get("powerball.png"));
balloonTextures.push_back(balloon5Texture);
// Texturas - Explosiones
Texture *explosion1Texture = new Texture(renderer, asset->get("balloon1_explosion.png"));
Texture *explosion1Texture = new Texture(renderer, asset->get("explosion1.png"));
explosionsTextures.push_back(explosion1Texture);
Texture *explosion2Texture = new Texture(renderer, asset->get("balloon2_explosion.png"));
Texture *explosion2Texture = new Texture(renderer, asset->get("explosion2.png"));
explosionsTextures.push_back(explosion2Texture);
Texture *explosion3Texture = new Texture(renderer, asset->get("balloon3_explosion.png"));
Texture *explosion3Texture = new Texture(renderer, asset->get("explosion3.png"));
explosionsTextures.push_back(explosion3Texture);
Texture *explosion4Texture = new Texture(renderer, asset->get("balloon4_explosion.png"));
Texture *explosion4Texture = new Texture(renderer, asset->get("explosion4.png"));
explosionsTextures.push_back(explosion4Texture);
// Texturas - Items
@@ -454,19 +440,19 @@ void Game::loadMedia()
// Animaciones -- Explosiones
std::vector<std::string> *explosions1Animation = new std::vector<std::string>;
loadAnimations(asset->get("balloon1_explosion.ani"), explosions1Animation);
loadAnimations(asset->get("explosion1.ani"), explosions1Animation);
explosionsAnimations.push_back(explosions1Animation);
std::vector<std::string> *explosions2Animation = new std::vector<std::string>;
loadAnimations(asset->get("balloon2_explosion.ani"), explosions2Animation);
loadAnimations(asset->get("explosion2.ani"), explosions2Animation);
explosionsAnimations.push_back(explosions2Animation);
std::vector<std::string> *explosions3Animation = new std::vector<std::string>;
loadAnimations(asset->get("balloon3_explosion.ani"), explosions3Animation);
loadAnimations(asset->get("explosion3.ani"), explosions3Animation);
explosionsAnimations.push_back(explosions3Animation);
std::vector<std::string> *explosions4Animation = new std::vector<std::string>;
loadAnimations(asset->get("balloon4_explosion.ani"), explosions4Animation);
loadAnimations(asset->get("explosion4.ani"), explosions4Animation);
explosionsAnimations.push_back(explosions4Animation);
// Animaciones -- Items
@@ -530,8 +516,6 @@ void Game::unloadMedia()
// Texturas
delete bulletTexture;
delete gameTextTexture;
delete gameOverTexture;
delete gameOverEndTexture;
for (auto texture : player1Textures)
{