singletons

source/core/resources/resource.cpp

@@ -12,6 +12,9 @@
 #include "core/resources/resource_helper.h"
 #include "game/ui/menu.h"
 
+// Nota: Asset::get() e Input::get() se consultan en preloadAll y al construir
+// los menús; no se guardan punteros en el objeto Resource.
+
 Resource *Resource::instance_ = nullptr;
 
 static std::string basename(const std::string &path) {
@@ -25,9 +28,9 @@ static std::string stem(const std::string &path) {
     return b.substr(0, dot);
 }
 
-void Resource::init(SDL_Renderer *renderer, Asset *asset, Input *input) {
+void Resource::init(SDL_Renderer *renderer) {
     if (instance_ == nullptr) {
-        instance_ = new Resource(renderer, asset, input);
+        instance_ = new Resource(renderer);
         instance_->preloadAll();
     }
 }
@@ -41,10 +44,8 @@ Resource *Resource::get() {
     return instance_;
 }
 
-Resource::Resource(SDL_Renderer *renderer, Asset *asset, Input *input)
-    : renderer_(renderer),
-      asset_(asset),
-      input_(input) {}
+Resource::Resource(SDL_Renderer *renderer)
+    : renderer_(renderer) {}
 
 Resource::~Resource() {
     for (auto &[name, m] : menus_) delete m;
@@ -64,7 +65,7 @@ Resource::~Resource() {
 }
 
 void Resource::preloadAll() {
-    const auto &items = asset_->getAll();
+    const auto &items = Asset::get()->getAll();
 
     // Pass 1: texturas, sonidos, músicas, animaciones (raw lines), demo, lenguajes
     for (const auto &it : items) {
@@ -155,7 +156,7 @@ void Resource::preloadAll() {
         if (bname.size() < 4 || bname.substr(bname.size() - 4) != ".men") continue;
         auto bytes = ResourceHelper::loadFile(it.file);
         if (bytes.empty()) continue;
-        Menu *m = new Menu(renderer_, asset_, input_, "");
+        Menu *m = new Menu(renderer_, "");
         m->loadFromBytes(bytes, bname);
         const std::string s = stem(it.file);
         menus_[s] = m;