layout test

src/assets/Assets.cpp

@@ -87,6 +87,9 @@ void Assets::extend(const Assets& assets) {
     for (auto entry : assets.atlases) {
         atlases[entry.first] = entry.second;
     }
+	for (auto entry : assets.layouts) {
+		layouts[entry.first] = entry.second;
+	}
     animations.clear();
 	for (auto entry : assets.animations) {
 		animations.emplace_back(entry);

src/assets/AssetsLoader.cpp

@@ -9,9 +9,6 @@
 #include "../constants.h"
 #include "../files/engine_paths.h"
 
-using std::filesystem::path;
-using std::unique_ptr;
-
 AssetsLoader::AssetsLoader(Assets* assets, const ResPaths* paths) 
 	: assets(assets), paths(paths) {
 }

src/assets/AssetsLoader.h

@@ -15,7 +15,7 @@ const short ASSET_LAYOUT = 5;
 class ResPaths;
 class Assets;
 
-typedef std::function<bool(Assets*, const ResPaths*, const std::string&, const std::string&)> aloader_func;
+using aloader_func = std::function<bool(Assets*, const ResPaths*, const std::string&, const std::string&)>;
 
 struct aloader_entry {
 	int tag;