Singletonejant

Borrat menu.cpp que no estava gastantse...mmm.. desde mai
This commit is contained in:
2025-02-22 18:27:23 +01:00
parent e361d295c1
commit fc01676df2
38 changed files with 440 additions and 1751 deletions

View File

@@ -13,10 +13,10 @@
#include "options.h"
// Constructor
LoadingScreen::LoadingScreen(Resource *resource)
LoadingScreen::LoadingScreen()
: screen_(Screen::get()),
renderer_(Screen::get()->getRenderer()),
resource_(resource),
resource_(Resource::get()),
asset_(Asset::get()),
input_(Input::get())
{
@@ -24,13 +24,13 @@ LoadingScreen::LoadingScreen(Resource *resource)
eventHandler = new SDL_Event();
if (options.palette == p_zxspectrum)
{
mono_loading_screen_texture_ = resource->getTexture("loading_screen_bn.png");
color_loading_screen_texture_ = resource->getTexture("loading_screen_color.png");
mono_loading_screen_texture_ = resource_->getTexture("loading_screen_bn.png");
color_loading_screen_texture_ = resource_->getTexture("loading_screen_color.png");
}
else if (options.palette == p_zxarne)
{
mono_loading_screen_texture_ = resource->getTexture("loading_screen_bn_zxarne.png");
color_loading_screen_texture_ = resource->getTexture("loading_screen_color_zxarne.png");
mono_loading_screen_texture_ = resource_->getTexture("loading_screen_bn_zxarne.png");
color_loading_screen_texture_ = resource_->getTexture("loading_screen_color_zxarne.png");
}
mono_loading_screen_sprite_ = new Sprite(0, 0, mono_loading_screen_texture_->getWidth(), mono_loading_screen_texture_->getHeight(), mono_loading_screen_texture_, renderer_);
color_loading_screen_sprite_ = new Sprite(0, 0, color_loading_screen_texture_->getWidth(), color_loading_screen_texture_->getHeight(), color_loading_screen_texture_, renderer_);
@@ -251,8 +251,7 @@ void LoadingScreen::update()
// Gestiona el contador de carga
updateLoad();
// Actualiza las notificaciones
screen_->updateNotifier();
screen_->update();
}
}