unificats els resources en un namespace
This commit is contained in:
@@ -11,8 +11,8 @@
|
||||
#include "core/rendering/surface.hpp" // Para Surface
|
||||
#include "core/rendering/surface_sprite.hpp" // Para SSprite
|
||||
#include "core/rendering/text.hpp" // Para Text, TEXT_CENTER, TEXT_COLOR
|
||||
#include "core/resources/asset.hpp" // Para Asset
|
||||
#include "core/resources/resource.hpp" // Para Resource
|
||||
#include "core/resources/resource_cache.hpp" // Para Resource
|
||||
#include "core/resources/resource_list.hpp" // Para Asset
|
||||
#include "core/system/global_events.hpp" // Para check
|
||||
#include "game/gameplay/cheevos.hpp" // Para Cheevos, Achievement
|
||||
#include "game/options.hpp" // Para Options, options, SectionState, Section
|
||||
@@ -22,14 +22,14 @@
|
||||
|
||||
// Constructor
|
||||
Title::Title()
|
||||
: game_logo_surface_(Resource::get()->getSurface("title_logo.gif")),
|
||||
: game_logo_surface_(Resource::Cache::get()->getSurface("title_logo.gif")),
|
||||
game_logo_sprite_(std::make_unique<SurfaceSprite>(game_logo_surface_, 29, 9, game_logo_surface_->getWidth(), game_logo_surface_->getHeight())),
|
||||
loading_screen_surface_(Resource::get()->getSurface("loading_screen_color.gif")),
|
||||
loading_screen_surface_(Resource::Cache::get()->getSurface("loading_screen_color.gif")),
|
||||
loading_screen_sprite_(std::make_unique<SurfaceSprite>(loading_screen_surface_, 0, 0, loading_screen_surface_->getWidth(), loading_screen_surface_->getHeight())),
|
||||
title_surface_(std::make_shared<Surface>(Options::game.width, Options::game.height)),
|
||||
delta_timer_(std::make_unique<DeltaTimer>()),
|
||||
marquee_text_(Resource::get()->getText("gauntlet")),
|
||||
menu_text_(Resource::get()->getText("gauntlet")) {
|
||||
marquee_text_(Resource::Cache::get()->getText("gauntlet")),
|
||||
menu_text_(Resource::Cache::get()->getText("gauntlet")) {
|
||||
// Inicializa arrays con valores por defecto
|
||||
temp_keys_.fill(SDL_SCANCODE_UNKNOWN);
|
||||
temp_buttons_.fill(-1);
|
||||
@@ -437,7 +437,7 @@ void Title::createCheevosTexture() {
|
||||
|
||||
// Crea la textura con el listado de logros
|
||||
const auto CHEEVOS_LIST = Cheevos::get()->list();
|
||||
const auto TEXT = Resource::get()->getText("subatomic");
|
||||
const auto TEXT = Resource::Cache::get()->getText("subatomic");
|
||||
constexpr int CHEEVOS_TEXTURE_WIDTH = 200;
|
||||
constexpr int CHEEVOS_TEXTURE_VIEW_HEIGHT = MENU_ZONE_HEIGHT;
|
||||
constexpr int CHEEVOS_PADDING = 10;
|
||||
@@ -653,7 +653,7 @@ void Title::applyKeyboardRemap() {
|
||||
Input::get()->applyKeyboardBindingsFromOptions();
|
||||
|
||||
// Guardar a archivo de configuracion
|
||||
Options::saveToFile(Asset::get()->get("config.txt"));
|
||||
Options::saveToFile(Resource::List::get()->get("config.txt"));
|
||||
}
|
||||
|
||||
// Dibuja la pantalla de redefinir teclado
|
||||
@@ -836,7 +836,7 @@ void Title::applyJoystickRemap() {
|
||||
Input::get()->applyGamepadBindingsFromOptions();
|
||||
|
||||
// Guardar a archivo de configuracion
|
||||
Options::saveToFile(Asset::get()->get("config.txt"));
|
||||
Options::saveToFile(Resource::List::get()->get("config.txt"));
|
||||
}
|
||||
|
||||
// Retorna el nombre amigable del botón del gamepad
|
||||
|
||||
Reference in New Issue
Block a user