From e059593a0b3a50b21c9fbbb54053c3d04bbf42e6 Mon Sep 17 00:00:00 2001 From: Joshua Granick Date: Thu, 22 Dec 2016 09:00:04 -0800 Subject: [PATCH] Respect 'embed=false' assets on HTML5 --- templates/haxe/DefaultAssetLibrary.hx | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/templates/haxe/DefaultAssetLibrary.hx b/templates/haxe/DefaultAssetLibrary.hx index f12aee8f5..183408bd9 100644 --- a/templates/haxe/DefaultAssetLibrary.hx +++ b/templates/haxe/DefaultAssetLibrary.hx @@ -48,7 +48,8 @@ import sys.FileSystem; ::if (assets != null)::var id; ::foreach assets::id = "::id::"; - ::if (embed)::::if (type == "font")::classTypes.set (id, __ASSET__::flatName::); preload.set (id, true);::else::paths.set (id, ::if (resourceName == id)::id::else::"::resourceName::"::end::);::end:: + ::if (embed)::preload.set (id, true); + ::if (type == "font")::classTypes.set (id, __ASSET__::flatName::);::else::paths.set (id, ::if (resourceName == id)::id::else::"::resourceName::"::end::);::end:: ::else::paths.set (id, ::if (resourceName == id)::id::else::"::resourceName::"::end::);::end:: types.set (id, AssetType.$$upper(::type::)); ::end::::end:: @@ -63,10 +64,6 @@ import sys.FileSystem; } } - for (id in paths.keys()) { - preload.set (id, true); - } - #else #if (windows || mac || linux)