eliminades referencies a .ani
This commit is contained in:
@@ -163,8 +163,7 @@ auto shouldUseResourcePack(const std::string& filepath) -> bool {
|
|||||||
// Check if it looks like a data file (has common extensions)
|
// Check if it looks like a data file (has common extensions)
|
||||||
if (path.find(".ogg") != std::string::npos || path.find(".wav") != std::string::npos ||
|
if (path.find(".ogg") != std::string::npos || path.find(".wav") != std::string::npos ||
|
||||||
path.find(".gif") != std::string::npos || path.find(".png") != std::string::npos ||
|
path.find(".gif") != std::string::npos || path.find(".png") != std::string::npos ||
|
||||||
path.find(".pal") != std::string::npos || path.find(".ani") != std::string::npos ||
|
path.find(".pal") != std::string::npos || path.find(".yaml") != std::string::npos ||
|
||||||
path.find(".yaml") != std::string::npos ||
|
|
||||||
path.find(".txt") != std::string::npos || path.find(".glsl") != std::string::npos) {
|
path.find(".txt") != std::string::npos || path.find(".glsl") != std::string::npos) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ Scoreboard::Scoreboard(std::shared_ptr<Data> data)
|
|||||||
|
|
||||||
// Reserva memoria para los objetos
|
// Reserva memoria para los objetos
|
||||||
// auto player_texture = Resource::Cache::get()->getSurface(Options::cheats.alternate_skin == Options::Cheat::State::ENABLED ? "player2.gif" : "player.gif");
|
// auto player_texture = Resource::Cache::get()->getSurface(Options::cheats.alternate_skin == Options::Cheat::State::ENABLED ? "player2.gif" : "player.gif");
|
||||||
auto player_animations = Resource::Cache::get()->getAnimations(Options::cheats.alternate_skin == Options::Cheat::State::ENABLED ? "player2.ani" : "player.ani");
|
auto player_animations = Resource::Cache::get()->getAnimations(Options::cheats.alternate_skin == Options::Cheat::State::ENABLED ? "player2.yaml" : "player.yaml");
|
||||||
player_sprite_ = std::make_shared<SurfaceAnimatedSprite>(player_animations);
|
player_sprite_ = std::make_shared<SurfaceAnimatedSprite>(player_animations);
|
||||||
player_sprite_->setCurrentAnimation("walk_menu");
|
player_sprite_->setCurrentAnimation("walk_menu");
|
||||||
|
|
||||||
|
|||||||
@@ -23,7 +23,7 @@
|
|||||||
Credits::Credits()
|
Credits::Credits()
|
||||||
: text_surface_(std::make_shared<Surface>(Options::game.width, Options::game.height)),
|
: text_surface_(std::make_shared<Surface>(Options::game.width, Options::game.height)),
|
||||||
cover_surface_(std::make_shared<Surface>(Options::game.width, Options::game.height)),
|
cover_surface_(std::make_shared<Surface>(Options::game.width, Options::game.height)),
|
||||||
shining_sprite_(std::make_shared<SurfaceAnimatedSprite>(Resource::Cache::get()->getAnimations("shine.ani"))),
|
shining_sprite_(std::make_shared<SurfaceAnimatedSprite>(Resource::Cache::get()->getAnimations("shine.yaml"))),
|
||||||
delta_timer_(std::make_unique<DeltaTimer>()) {
|
delta_timer_(std::make_unique<DeltaTimer>()) {
|
||||||
// Configura la escena
|
// Configura la escena
|
||||||
SceneManager::current = SceneManager::Scene::CREDITS;
|
SceneManager::current = SceneManager::Scene::CREDITS;
|
||||||
|
|||||||
@@ -287,7 +287,7 @@ void Ending2::loadSprites() {
|
|||||||
|
|
||||||
// Carga los sprites
|
// Carga los sprites
|
||||||
for (const auto& file : sprite_list_) {
|
for (const auto& file : sprite_list_) {
|
||||||
sprites_.emplace_back(std::make_shared<SurfaceAnimatedSprite>(Resource::Cache::get()->getAnimations(file + ".ani")));
|
sprites_.emplace_back(std::make_shared<SurfaceAnimatedSprite>(Resource::Cache::get()->getAnimations(file + ".yaml")));
|
||||||
sprite_max_width_ = std::max(sprites_.back()->getWidth(), sprite_max_width_);
|
sprite_max_width_ = std::max(sprites_.back()->getWidth(), sprite_max_width_);
|
||||||
sprite_max_height_ = std::max(sprites_.back()->getHeight(), sprite_max_height_);
|
sprite_max_height_ = std::max(sprites_.back()->getHeight(), sprite_max_height_);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -575,7 +575,7 @@ void Game::checkEndGameCheevos() {
|
|||||||
|
|
||||||
// Inicializa al jugador
|
// Inicializa al jugador
|
||||||
void Game::initPlayer(const Player::SpawnData& spawn_point, std::shared_ptr<Room> room) {
|
void Game::initPlayer(const Player::SpawnData& spawn_point, std::shared_ptr<Room> room) {
|
||||||
std::string player_animations = Options::cheats.alternate_skin == Options::Cheat::State::ENABLED ? "player2.ani" : "player.ani";
|
std::string player_animations = Options::cheats.alternate_skin == Options::Cheat::State::ENABLED ? "player2.yaml" : "player.yaml";
|
||||||
const Player::Data PLAYER{spawn_point, player_animations, std::move(room)};
|
const Player::Data PLAYER{spawn_point, player_animations, std::move(room)};
|
||||||
player_ = std::make_shared<Player>(PLAYER);
|
player_ = std::make_shared<Player>(PLAYER);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -21,8 +21,8 @@
|
|||||||
|
|
||||||
// Constructor
|
// Constructor
|
||||||
GameOver::GameOver()
|
GameOver::GameOver()
|
||||||
: player_sprite_(std::make_shared<SurfaceAnimatedSprite>(Resource::Cache::get()->getAnimations("player_game_over.ani"))),
|
: player_sprite_(std::make_shared<SurfaceAnimatedSprite>(Resource::Cache::get()->getAnimations("player_game_over.yaml"))),
|
||||||
tv_sprite_(std::make_shared<SurfaceAnimatedSprite>(Resource::Cache::get()->getAnimations("tv.ani"))),
|
tv_sprite_(std::make_shared<SurfaceAnimatedSprite>(Resource::Cache::get()->getAnimations("tv.yaml"))),
|
||||||
delta_timer_(std::make_shared<DeltaTimer>()) {
|
delta_timer_(std::make_shared<DeltaTimer>()) {
|
||||||
SceneManager::current = SceneManager::Scene::GAME_OVER;
|
SceneManager::current = SceneManager::Scene::GAME_OVER;
|
||||||
SceneManager::options = SceneManager::Options::NONE;
|
SceneManager::options = SceneManager::Options::NONE;
|
||||||
|
|||||||
Reference in New Issue
Block a user