From 559f8ea690612d99aa19681fc70e7cdafb5a7a55 Mon Sep 17 00:00:00 2001 From: Nat Quayle Nelson Date: Thu, 8 Sep 2022 20:46:45 +0000 Subject: [PATCH] fix NAT flixel cpp bug --- src/nat/systems/ImageAttachmentSystem.kiss | 41 +++++++++++----------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/src/nat/systems/ImageAttachmentSystem.kiss b/src/nat/systems/ImageAttachmentSystem.kiss index 216dfd8..cd98a10 100644 --- a/src/nat/systems/ImageAttachmentSystem.kiss +++ b/src/nat/systems/ImageAttachmentSystem.kiss @@ -19,24 +19,25 @@ // Also, remove text image files -- now that text sprites // are generated on the fly. (function :Bool upgradeToVersion2 [:nat.Archive archive :nat.Entry e] - (when (hasComponent e Images) - (let [images1 (readComponent e Images) - scale (readComponentOr e Scale 1.0) - pIdx images1.pinnedImageIndex - textImageFiles (filter images1.imageFiles ->[:String f] (f.startsWith "textImage"))] - (removeComponent archive e Images) - (removeFiles archive e textImageFiles) - (doFor f textImageFiles (images1.imageFiles.remove f)) - // If all images were removed (the entry only had a text image), don't add Images2 - (unless images1.imageFiles (return true)) + (if (hasComponent e Images) + (let [images1 (readComponent e Images) + scale (readComponentOr e Scale 1.0) + pIdx images1.pinnedImageIndex + textImageFiles (filter images1.imageFiles ->[:String f] (f.startsWith "textImage"))] + (removeComponent archive e Images) + (removeFiles archive e textImageFiles) + (doFor f textImageFiles (images1.imageFiles.remove f)) + // If all images were removed (the entry only had a text image), don't add Images2 + (unless images1.imageFiles (return true)) - (addComponent archive e Images2 - (object - imageFiles images1.imageFiles - imageScales (cast (concat - (for _ (range pIdx) 1.0) - [scale] - (for _ (range (- images1.imageFiles.length 1 pIdx)) 1.0))) - pinnedImageIndex pIdx)) - (removeComponent archive e Scale) - true))) \ No newline at end of file + (addComponent archive e Images2 + (object + imageFiles images1.imageFiles + imageScales (cast (concat + (for _ (range pIdx) 1.0) + [scale] + (for _ (range (- images1.imageFiles.length 1 pIdx)) 1.0))) + pinnedImageIndex pIdx)) + (removeComponent archive e Scale) + true) + false)) \ No newline at end of file