diff --git a/data/gfx/player/player1_one_coffee_palette.pal b/data/gfx/player/player1_1_coffee_palette.gif similarity index 100% rename from data/gfx/player/player1_one_coffee_palette.pal rename to data/gfx/player/player1_1_coffee_palette.gif diff --git a/data/gfx/player/player1_two_coffee_palette.pal b/data/gfx/player/player1_2_coffee_palette.gif similarity index 100% rename from data/gfx/player/player1_two_coffee_palette.pal rename to data/gfx/player/player1_2_coffee_palette.gif diff --git a/data/gfx/player/player1_all_white_palette.pal b/data/gfx/player/player1_all_white_palette.pal deleted file mode 100644 index 8adecb7..0000000 Binary files a/data/gfx/player/player1_all_white_palette.pal and /dev/null differ diff --git a/data/gfx/player/player1_invencible_palette.gif b/data/gfx/player/player1_invencible_palette.gif new file mode 100644 index 0000000..1c85424 Binary files /dev/null and b/data/gfx/player/player1_invencible_palette.gif differ diff --git a/data/gfx/player/player2_one_coffee_palette.pal b/data/gfx/player/player2_1_coffee_palette.gif similarity index 100% rename from data/gfx/player/player2_one_coffee_palette.pal rename to data/gfx/player/player2_1_coffee_palette.gif diff --git a/data/gfx/player/player2_two_coffee_palette.pal b/data/gfx/player/player2_2_coffee_palette.gif similarity index 100% rename from data/gfx/player/player2_two_coffee_palette.pal rename to data/gfx/player/player2_2_coffee_palette.gif diff --git a/data/gfx/player/player2_all_white_palette.pal b/data/gfx/player/player2_all_white_palette.pal deleted file mode 100644 index 2b45990..0000000 Binary files a/data/gfx/player/player2_all_white_palette.pal and /dev/null differ diff --git a/data/gfx/player/player2_invencible_palette.gif b/data/gfx/player/player2_invencible_palette.gif new file mode 100644 index 0000000..2c569cb Binary files /dev/null and b/data/gfx/player/player2_invencible_palette.gif differ diff --git a/source/credits.cpp b/source/credits.cpp index bac7f69..57fb9c3 100644 --- a/source/credits.cpp +++ b/source/credits.cpp @@ -40,8 +40,6 @@ Credits::Credits() throw std::runtime_error("Failed to create SDL texture for text."); } section::name = section::Name::CREDITS; - // top_black_rect_ = {play_area_.x, 0, play_area_.w, black_bars_size_}; - // bottom_black_rect_ = {play_area_.x, param.game.game_area.rect.h - black_bars_size_, play_area_.w, black_bars_size_}; balloon_manager_->setPlayArea(play_area_); fade_in_->setColor(fade_color.r, fade_color.g, fade_color.b); diff --git a/source/director.cpp b/source/director.cpp index dbb2fb0..1979cc0 100644 --- a/source/director.cpp +++ b/source/director.cpp @@ -505,17 +505,17 @@ void Director::setFileList() { // Jugador 1 Asset::get()->add(prefix + "/data/gfx/player/player1.gif", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/gfx/player/player1_one_coffee_palette.pal", AssetType::PALETTE); - Asset::get()->add(prefix + "/data/gfx/player/player1_two_coffee_palette.pal", AssetType::PALETTE); - Asset::get()->add(prefix + "/data/gfx/player/player1_all_white_palette.pal", AssetType::PALETTE); + Asset::get()->add(prefix + "/data/gfx/player/player1_1_coffee_palette.gif", AssetType::PALETTE); + Asset::get()->add(prefix + "/data/gfx/player/player1_2_coffee_palette.gif", AssetType::PALETTE); + Asset::get()->add(prefix + "/data/gfx/player/player1_invencible_palette.gif", AssetType::PALETTE); Asset::get()->add(prefix + "/data/gfx/player/player1_power.png", AssetType::BITMAP); } { // Jugador 2 Asset::get()->add(prefix + "/data/gfx/player/player2.gif", AssetType::BITMAP); - Asset::get()->add(prefix + "/data/gfx/player/player2_one_coffee_palette.pal", AssetType::PALETTE); - Asset::get()->add(prefix + "/data/gfx/player/player2_two_coffee_palette.pal", AssetType::PALETTE); - Asset::get()->add(prefix + "/data/gfx/player/player2_all_white_palette.pal", AssetType::PALETTE); + Asset::get()->add(prefix + "/data/gfx/player/player2_1_coffee_palette.gif", AssetType::PALETTE); + Asset::get()->add(prefix + "/data/gfx/player/player2_2_coffee_palette.gif", AssetType::PALETTE); + Asset::get()->add(prefix + "/data/gfx/player/player2_invencible_palette.gif", AssetType::PALETTE); Asset::get()->add(prefix + "/data/gfx/player/player2_power.png", AssetType::BITMAP); } diff --git a/source/resource.cpp b/source/resource.cpp index f63aa61..73e6a36 100644 --- a/source/resource.cpp +++ b/source/resource.cpp @@ -254,14 +254,14 @@ void Resource::addPalettes() { // Jugador 1 std::cout << "\n>> PALETTES" << std::endl; - getTexture("player1.gif")->addPaletteFromFile(Asset::get()->get("player1_one_coffee_palette.pal")); - getTexture("player1.gif")->addPaletteFromFile(Asset::get()->get("player1_two_coffee_palette.pal")); - getTexture("player1.gif")->addPaletteFromFile(Asset::get()->get("player1_all_white_palette.pal")); + getTexture("player1.gif")->addPaletteFromFile(Asset::get()->get("player1_1_coffee_palette.gif")); + getTexture("player1.gif")->addPaletteFromFile(Asset::get()->get("player1_2_coffee_palette.gif")); + getTexture("player1.gif")->addPaletteFromFile(Asset::get()->get("player1_invencible_palette.gif")); // Jugador 2 - getTexture("player2.gif")->addPaletteFromFile(Asset::get()->get("player2_one_coffee_palette.pal")); - getTexture("player2.gif")->addPaletteFromFile(Asset::get()->get("player2_two_coffee_palette.pal")); - getTexture("player2.gif")->addPaletteFromFile(Asset::get()->get("player2_all_white_palette.pal")); + getTexture("player2.gif")->addPaletteFromFile(Asset::get()->get("player2_1_coffee_palette.gif")); + getTexture("player2.gif")->addPaletteFromFile(Asset::get()->get("player2_2_coffee_palette.gif")); + getTexture("player2.gif")->addPaletteFromFile(Asset::get()->get("player2_invencible_palette.gif")); // Fuentes getTexture("smb2.gif")->addPaletteFromFile(Asset::get()->get("smb2_palette1.pal"));