blam: Fix custom map loading

hbirchtree · hbirchtree · commit 180877aa1f6e · 2026-05-30T04:05:34.000+02:00
diff --git a/.cmake/CMakePresets.wasm.json b/.cmake/CMakePresets.wasm.json
@@ -96,6 +96,12 @@
             "configurePreset": "web-wasm32-emscripten-webgl2",
             "inherits": "base-linux"
         },
+        {
+            "name": "web-wasm32-emscripten-webgl2-custom-dbg",
+            "environment": {"BUILD_TYPE":"Debug"},
+            "configurePreset": "web-wasm32-emscripten-webgl2-custom",
+            "inherits": "base-linux"
+        },
         {
             "name": "web-wasm64-emscripten-webgl2-dbg",
             "environment": {"BUILD_TYPE":"Debug"},
diff --git a/examples/blam/cblam-testing/ui_caching.h b/examples/blam/cblam-testing/ui_caching.h
@@ -56,8 +56,10 @@ struct FontCache
     {
         if(auto tag_it = index.find(font_tag); tag_it == index.end())
             return nullptr;
+        else if(auto data = (*tag_it).template data<blam::font>(magic); !data.has_value())
+            return nullptr;
         else
-            return (*tag_it).template data<blam::font>(magic).value();
+            return data.value();
     }
 
     void allocate_font_texture()

Original file line number	Diff line number	Diff line change
`@@ -56,8 +56,10 @@ struct FontCache`
`56`	`56`	`{`
`57`	`57`	`if(auto tag_it = index.find(font_tag); tag_it == index.end())`
`58`	`58`	`return nullptr;`
	`59`	`+ else if(auto data = (*tag_it).template data<blam::font>(magic); !data.has_value())`
	`60`	`+ return nullptr;`
`59`	`61`	`else`
`60`		`- return (*tag_it).template data<blam::font>(magic).value();`
	`62`	`+ return data.value();`
`61`	`63`	`}`
`62`	`64`
`63`	`65`	`void allocate_font_texture()`