some linting

[blank.git] / src / app / Assets.hpp

diff --git a/src/app/Assets.hpp b/src/app/Assets.hpp
index 64bc72ce81f1239ab884b739989f701e9604ffe8..9766577c565dd0d11b9ce4f0c98db3bbae1094d4 100644 (file)
--- a/src/app/Assets.hpp
+++ b/src/app/Assets.hpp
@@ -12,10 +12,10 @@ class ArrayTexture;
 class BlockTypeRegistry;
 class CubeMap;
 class ModelRegistry;
+class ResourceIndex;
 class ShapeRegistry;
 class Sound;
 class Texture;
-class TextureIndex;
 
 class AssetLoader {
 
@@ -25,20 +25,21 @@ public:
        void LoadBlockTypes(
                const std::string &set_name,
                BlockTypeRegistry &,
-               TextureIndex &,
+               ResourceIndex &snd,
+               ResourceIndex &tex,
                const ShapeRegistry &) const;
        CubeMap LoadCubeMap(const std::string &name) const;
        Font LoadFont(const std::string &name, int size) const;
        void LoadModels(
                const std::string &set_name,
                ModelRegistry &,
-               TextureIndex &,
+               ResourceIndex &,
                const ShapeRegistry &) const;
        void LoadShapes(const std::string &set_name, ShapeRegistry &) const;
        Sound LoadSound(const std::string &name) const;
        Texture LoadTexture(const std::string &name) const;
        void LoadTexture(const std::string &name, ArrayTexture &, int layer) const;
-       void LoadTextures(const TextureIndex &, ArrayTexture &) const;
+       void LoadTextures(const ResourceIndex &, ArrayTexture &) const;
 
 private:
        std::string fonts;
@@ -53,7 +54,7 @@ struct Assets {
        Font large_ui_font;
        Font small_ui_font;
 
-       Assets(const AssetLoader &);
+       explicit Assets(const AssetLoader &);
 
 };